merge trunk
authorK. Handa <handa@gnu.org>
Wed, 24 Apr 2013 14:48:48 +0000 (23:48 +0900)
committerK. Handa <handa@gnu.org>
Wed, 24 Apr 2013 14:48:48 +0000 (23:48 +0900)
commita31fb1c89414e6f42564dda596b6134c17ecabe7
tree2981babb9e7611caf2b9c978e249b04fa1398a79
parentbe4383026ac313a4386c4e06ad511335a187f3ca
parentade4d06cefc8a8e8561e4d00acf38fea39fbc05f
merge trunk